bitkeeper revision 1.972 (40d139b2Pih8HslUqkfo5Phz7g0NTg)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 17 Jun 2004 06:26:58 +0000 (06:26 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 17 Jun 2004 06:26:58 +0000 (06:26 +0000)
Merge ssh://xenbk@gandalf.hpl.hp.com//var/bk/xeno-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk

1  2 
.rootkeys

diff --cc .rootkeys
Simple merge